clean up filter includes. (#431)

remove obsolete definition of filter_vecs_t.
don't included filterdefs.h in each filters .cc file.
add QVector include to each filters .h file.

diff --git a/arcdist.cc b/arcdist.cc
index 962fe3ad43274c827ab072f160d9faa015b6ed9d..749efdef4d05108331979abd7604d6fe0ea5a409 100644 (file)
--- a/arcdist.cc
+++ b/arcdist.cc
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include "arcdist.h"
-#include "filterdefs.h"
 #include "grtcirc.h"
 
 #include <cmath>

diff --git a/arcdist.h b/arcdist.h
index 0c158b78c949c90ec937856cc0cdc6092350008e..ef12f39c3d4c48fce1e18d4751b0cbef4dff6ac4 100644 (file)
--- a/arcdist.h
+++ b/arcdist.h
@@ -22,6 +22,8 @@
 #ifndef ARCDIST_H_INCLUDED_
 #define ARCDIST_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for ARG_NOMINMAX, ARGTYPE_BOOL, Waypoint (ptr only)
 #include "filter.h"  // for Filter
 

diff --git a/bend.cc b/bend.cc
index 4dd6f7f5514a74cd57069bdf64ba648cad70070f..65839d2ea729903fd8ee92912d40a9a56c1c21ad 100644 (file)
--- a/bend.cc
+++ b/bend.cc
@@ -27,7 +27,6 @@
 #include <QtCore/QtGlobal>  // for qAsConst, QAddConst<>::Type, foreach
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "bend.h"
 #include "grtcirc.h"        // for RAD, heading_true_degrees, gcdist, linepart, radtometers, DEG
 

diff --git a/bend.h b/bend.h
index 6e6f4977aa3974932d6f72afaf4b105a985c631f..643051df6b9e65ac8f8ef363388832d723ce9107 100644 (file)
--- a/bend.h
+++ b/bend.h
@@ -23,6 +23,8 @@
 #ifndef BEND_H_INCLUDED_
 #define BEND_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for route_head (ptr only), ARGTYPE_FLOAT, ARG_NOMINMAX
 #include "filter.h"  // for Filter
 

diff --git a/discard.cc b/discard.cc
index 42edf8a7362bd00cadbc464620ced44ec3f82fb7..5361b496ed5ed18a4a838ec3a4b39acb3eda0b2b 100644 (file)
--- a/discard.cc
+++ b/discard.cc
@@ -21,7 +21,6 @@
 
 #include "defs.h"
 #include "discard.h"
-#include "filterdefs.h"
 #include <cstdlib>
 // Can't use QRegularExpression because Linux won't get Qt 5 for years.
 #include <QtCore/QRegExp>

diff --git a/discard.h b/discard.h
index 155731d50aecad47a1ab49ab541b4086b7a1668a..76f8e8167ed8ff8112c04809bff2bd863ffd7bd1 100644 (file)
--- a/discard.h
+++ b/discard.h
@@ -24,6 +24,8 @@
 
 // Can't use QRegularExpression because Linux won't get Qt 5 for years.
 #include <QtCore/QRegExp>  // for QRegExp
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"          // for ARG_NOMINMAX, ARGTYPE_BEGIN_REQ, ARGTYPE_S...
 #include "filter.h"        // for Filter
 

diff --git a/duplicate.cc b/duplicate.cc
index 0583f7e480947231e46ccc3b1ea6f502c6ed5e7b..9642d0a2804f4a12154e281f89def638a3d830bf 100644 (file)
--- a/duplicate.cc
+++ b/duplicate.cc
@@ -27,7 +27,6 @@
 #include <QtCore/QtGlobal>      // for foreach
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "duplicate.h"
 #include "src/core/datetime.h"  // for DateTime
 

diff --git a/duplicate.h b/duplicate.h
index e34607f3fd432187502abb721291b1eb4e052651..d7fba88d837011d968c48ff0538b76ae08bbadde 100644 (file)
--- a/duplicate.h
+++ b/duplicate.h
@@ -22,6 +22,8 @@
 #ifndef DUPLICATE_H_INCLUDED_
 #define DUPLICATE_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for ARGTYPE_BOOL, ARG_NOMINMAX, Waypoint (ptr only)
 #include "filter.h"  // for Filter
 

diff --git a/filter.h b/filter.h
index 6f8c3dc7d6a066915f2b96b8773d03f547183593..6147afa74d197a2fb5ad68484a9e533264c35140 100644 (file)
--- a/filter.h
+++ b/filter.h
@@ -22,6 +22,10 @@
 
 #include "defs.h"
 
+// Filter have access to the global_waypoint_list, which formats really
+// shouldn't have.
+extern WaypointList* global_waypoint_list;
+
 class Filter
 {
 public:

diff --git a/filterdefs.h b/filterdefs.h
index 97b93ae8f9a4869297f6eb0213f3219b2e5530c7..944f00836277c97311ded4824f3e5b5ba9253a85 100644 (file)
--- a/filterdefs.h
+++ b/filterdefs.h
@@ -19,33 +19,14 @@
 
  */
 
-
-
-/*
- * Filters can do some things that modules really shouldn't do.
- * This is our (weak) attempt to make that distinction.
- */
-
 #ifndef FILTERDEFS_H_INCLUDED_
 #define FILTERDEFS_H_INCLUDED_
 
 #include "defs.h"
-#include "filter.h"
-
-extern WaypointList* global_waypoint_list;
-
-using filter_init = void (*)();
-using filter_process = void (*)();
-using filter_deinit = void (*)();
-using filter_exit = void (*)();
-
-struct filter_vecs_t {
-  filter_init f_init;
-  filter_process f_process;
-  filter_deinit f_deinit;
-  filter_exit f_exit;
-  QVector<arglist_t>* args;
-};
+
+
+// forward declare filter to avoid exposing global_waypoint_list by filter.h
+class Filter;
 
 Filter* find_filter_vec(const QString&);
 void free_filter_vec(Filter*);

diff --git a/height.cc b/height.cc
index a7699b7cc74a8f96791019aa67d8e836894c00f7..a485629c7a78b62ddda9245ffe5714b10ee389eb 100644 (file)
--- a/height.cc
+++ b/height.cc
@@ -23,7 +23,6 @@
 
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "height.h"
 #include <cmath>
 #include <cstdlib>

diff --git a/height.h b/height.h
index 8a472e8999516ce7eac1d3ad5562a48d0a38f440..aba0b365f8e43c8ee9344761704ab80108bda466 100644 (file)
--- a/height.h
+++ b/height.h
@@ -24,6 +24,8 @@
 #ifndef HEIGHT_H_INCLUDED_
 #define HEIGHT_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for ARG_NOMINMAX, Waypoint (ptr only), arglist_t
 #include "filter.h"  // for Filter
 

diff --git a/interpolate.cc b/interpolate.cc
index 754874201c97dfe283b959884e41777d36694da7..1c98c50a7c3d82f5ae29c3b642261fccd98d0528 100644 (file)
--- a/interpolate.cc
+++ b/interpolate.cc
@@ -25,7 +25,6 @@
 #include <QtCore/QtGlobal>      // for qAsConst, QAddConst<>::Type, foreach
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "interpolate.h"
 #include "grtcirc.h"            // for linepart, RAD, gcdist, radtomiles
 #include "src/core/datetime.h"  // for DateTime

diff --git a/interpolate.h b/interpolate.h
index dbb0d9ecf17bc89c0f35d2f9369fed3e25dac1bb..36fa127de7dcb9c40531cf026dcfdb76140c5281 100644 (file)
--- a/interpolate.h
+++ b/interpolate.h
@@ -22,6 +22,8 @@
 #ifndef INTERPOLATE_H_INCLUDED_
 #define INTERPOLATE_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for ARG_NOMINMAX, arglist_t, ARGTYPE_BEGIN_EXCL, ARG...
 #include "filter.h"  // for Filter
 

diff --git a/nukedata.cc b/nukedata.cc
index 6814caee6d7a70f741d4c495d0edee4830a9aae3..0b30e9a8e2cb58846429fbfcac6b7699573c1c8b 100644 (file)
--- a/nukedata.cc
+++ b/nukedata.cc
@@ -21,7 +21,6 @@
  */
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "nukedata.h"
 
 #if FILTERS_ENABLED

diff --git a/nukedata.h b/nukedata.h
index 2c7c87f054ff171069e8590651efac06f10a5af7..e6fe6bea0f7e407bd7b44518415874e887f2c5b7 100644 (file)
--- a/nukedata.h
+++ b/nukedata.h
@@ -23,6 +23,8 @@
 #ifndef NUKEDATA_H_INCLUDED_
 #define NUKEDATA_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI...
 #include "filter.h"  // for Filter
 

diff --git a/polygon.cc b/polygon.cc
index fc29678f16af79ef56e8e144cd6cad25f1e374f4..629c0d5aa067219c70d87fbb2ec4500cfd412a8e 100644 (file)
--- a/polygon.cc
+++ b/polygon.cc
@@ -25,7 +25,6 @@
 #include <QtCore/QtGlobal>  // for foreach
 
 #include "defs.h"
-#include "filterdefs.h"     // for global_waypoint_list
 #include "polygon.h"
 #include "gbfile.h"         // for gbfclose, gbfgetstr, gbfopen, gbfile
 

diff --git a/polygon.h b/polygon.h
index 893273cfacbc400e4e81e3a57fe74d4427159fda..3137f1d679726352dc6dd1b9f4336a5946ca578d 100644 (file)
--- a/polygon.h
+++ b/polygon.h
@@ -22,6 +22,8 @@
 #ifndef POLYGON_H_INCLUDED_
 #define POLYGON_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for ARG_NOMINMAX, arglist_t, ARGTYPE_BOOL, ARGTYPE_FILE
 #include "filter.h"  // for Filter
 

diff --git a/position.cc b/position.cc
index 95994fe6a4f9b9565e58f525b1b6a68efa8f8fe6..b2451e5fdc9788d2cb4d8bc51321713d6ba50bd6 100644 (file)
--- a/position.cc
+++ b/position.cc
@@ -26,7 +26,6 @@
 #include <QtCore/QtGlobal>  // for qAsConst, QAddConst<>::Type
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "grtcirc.h"        // for RAD, gcdist, radtometers
 #include "position.h"
 

diff --git a/position.h b/position.h
index db95575e4be279e1aa4cf44bdee5f89875c342ce..a7622c83b66720615aedf9b61edd4eb41c40d2c3 100644 (file)
--- a/position.h
+++ b/position.h
@@ -22,6 +22,8 @@
 #ifndef POSITION_H_INCLUDED_
 #define POSITION_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for route_head (ptr only), ARG_NOMINMAX, ARGTYPE_FLOAT
 #include "filter.h"  // for Filter
 

diff --git a/radius.cc b/radius.cc
index 5d700730846a3f6e9638f6e0ca216545a1eb45a5..73f4349e70970027e0a9bb029ba71cf75e7ec523 100644 (file)
--- a/radius.cc
+++ b/radius.cc
@@ -25,7 +25,6 @@
 #include <QtCore/QtGlobal>  // for foreach
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "radius.h"
 #include "grtcirc.h"        // for RAD, gcdist, radtomiles
 

diff --git a/radius.h b/radius.h
index 1a00c62c94da04e9ca4bfa9fe5456f125286bb3a..ab1b77e41a30681e83abf0c9b8157465719def04 100644 (file)
--- a/radius.h
+++ b/radius.h
@@ -22,6 +22,8 @@
 #ifndef RADIUS_H_INCLUDED_
 #define RADIUS_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for ARG_NOMINMAX, ARGTYPE_FLOAT, ARGTYPE_REQUIRED
 #include "filter.h"  // for Filter
 

diff --git a/reverse_route.cc b/reverse_route.cc
index c5101a237f81ae4d6f7acd09256c04e6b5be1ffe..ef0933038df5a177bc076ea09596b3dbc9d2c88d 100644 (file)
--- a/reverse_route.cc
+++ b/reverse_route.cc
@@ -23,7 +23,6 @@
 #include <QtCore/QList>  // for QList<>::iterator
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "reverse_route.h"
 
 #if FILTERS_ENABLED

diff --git a/reverse_route.h b/reverse_route.h
index 9dc9f3ce0e7252a9d8479deabfda2ca2e22bd644..af47ed4b3580d8d2f7bb05f188e4ff15d38231d0 100644 (file)
--- a/reverse_route.h
+++ b/reverse_route.h
@@ -18,6 +18,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
  */
+
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for Waypoint (ptr only), arglist_t, route_head (ptr ...
 #include "filter.h"  // for Filter
 

diff --git a/smplrout.cc b/smplrout.cc
index 0a08d493c46fdc8270dbb3249c993fa96aec9bb9..9ad6c2b86266044f3edfba8419c9f4c21cb17023 100644 (file)
--- a/smplrout.cc
+++ b/smplrout.cc
@@ -57,7 +57,6 @@
 */
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "grtcirc.h"
 #include "smplrout.h"
 #include <cstdlib>

diff --git a/smplrout.h b/smplrout.h
index 21bbaec17a5a4d542c356aabfaaa2fa2c375315f..1acd675f0e0f7bc360c9dfc67268cb7fe854189e 100644 (file)
--- a/smplrout.h
+++ b/smplrout.h
@@ -59,6 +59,8 @@
 #ifndef SMPLROUT_H_INCLUDED_
 #define SMPLROUT_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for route_head (ptr only), Waypoint (ptr only), ARGT...
 #include "filter.h"  // for Filter
 

diff --git a/sort.cc b/sort.cc
index 1efddd6db6590b09348089f6392c7e64cf71bacc..7f3f3df20f9d4caaf89b72b269aafb388917ad6f 100644 (file)
--- a/sort.cc
+++ b/sort.cc
@@ -24,7 +24,6 @@
 
 #include "defs.h"
 #include "src/core/datetime.h"  // for DateTime
-#include "filterdefs.h"
 #include "sort.h"
 
 #if FILTERS_ENABLED

diff --git a/sort.h b/sort.h
index ea2af5789bbbc3fc71cb7ec26820dd0d16e64042..4c031e47bea1fc7cecefb99d9d432e090d9792f7 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -22,6 +22,8 @@
 #ifndef SORT_H_INCLUDED_
 #define SORT_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI...
 #include "filter.h"  // for Filter
 

diff --git a/stackfilter.cc b/stackfilter.cc
index aa4114d16ddfaea494dde8af96b47e00d2c72f2a..5306e88c2df638adff8d5a27096f5d8c5e599eb0 100644 (file)
--- a/stackfilter.cc
+++ b/stackfilter.cc
@@ -22,7 +22,6 @@
 #include <cstdlib>  // for atoi
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "stackfilter.h"
 
 #if FILTERS_ENABLED

diff --git a/stackfilter.h b/stackfilter.h
index c535b716bb0364929dd2eeb778d48c878ef2809f..3d8cdcc466dd6bc4d212fd571227d5c332734fbd 100644 (file)
--- a/stackfilter.h
+++ b/stackfilter.h
@@ -22,6 +22,8 @@
 #ifndef STACKFILTER_H_INCLUDED_
 #define STACKFILTER_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for ARGTYPE_BOOL, ARG_NOMINMAX, ARGTYPE_BEGIN_EXCL
 #include "filter.h"  // for Filter
 

diff --git a/swapdata.cc b/swapdata.cc
index 45645b526c9df0c19512b6909634ca339d4c70c9..0eae5b9575a0ee199a5067261df567d9a9d09d1f 100644 (file)
--- a/swapdata.cc
+++ b/swapdata.cc
@@ -21,7 +21,6 @@
  */
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "swapdata.h"
 
 #define MYNAME "swapdata"

diff --git a/swapdata.h b/swapdata.h
index 37765d3f0af41247b97b277091174ca9113ebc9c..498dbdc5123205a124fe66746839033b879d6c53 100644 (file)
--- a/swapdata.h
+++ b/swapdata.h
@@ -23,6 +23,8 @@
 #ifndef SWAPDATA_H_INCLUDED_
 #define SWAPDATA_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for arglist_t, Waypoint
 #include "filter.h"  // for Filter
 

diff --git a/trackfilter.cc b/trackfilter.cc
index c7c99a39d8f9d3ee354b6b594fa12914df8b6b48..018d3110a1089f03d7dd6a88078e58a1f71e31a6 100644 (file)
--- a/trackfilter.cc
+++ b/trackfilter.cc
@@ -48,7 +48,6 @@
 #include <QtCore/QtGlobal>                 // for qAsConst, foreach, qPrintable, QAddConst<>::Type, qint64
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "trackfilter.h"
 
 #include "grtcirc.h"                       // for RAD, gcdist, radtometers, heading_true_degrees

diff --git a/trackfilter.h b/trackfilter.h
index d0caadaba7eef7a4ca5a63e89ccd8097319fa359..2261bfbf869dd7fdf6e83cd109783a67b48a2a0b 100644 (file)
--- a/trackfilter.h
+++ b/trackfilter.h
@@ -24,6 +24,7 @@
 
 #include <QtCore/QDateTime>  // for QDateTime
 #include <QtCore/QList>      // for QList
+#include <QtCore/QVector>    // for QVector
 #include <QtCore/QtGlobal>   // for qint64
 
 #include "defs.h"            // for ARG_NOMINMAX, route_head (ptr only), ARG...

diff --git a/transform.cc b/transform.cc
index b573ffe19ba18a6ed7daaae166339ec70466789a..7877a3ffded5411d7231d944b57b4342b05bae52 100644 (file)
--- a/transform.cc
+++ b/transform.cc
@@ -26,7 +26,6 @@
 #include <QtCore/QtGlobal>  // for foreach
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "transform.h"
 
 

diff --git a/transform.h b/transform.h
index 6577bc3225acb1c0b7b418d2fdda311d8c86e074..62949ad822ea344ebafcc540ad638c345a87874a 100644 (file)
--- a/transform.h
+++ b/transform.h
@@ -24,6 +24,8 @@
 #define TRANSFORM_H_INCLUDED_
 
 #include <QtCore/QString>  // for QString
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"          // for route_head (ptr only), ARG_NOMINMAX, ARGTY...
 #include "filter.h"        // for Filter
 

diff --git a/validate.cc b/validate.cc
index 69bfdead1039382568c668d172cfadb976897bd7..df7d2b8eeb805969f252072001bd0e07325d1651 100644 (file)
--- a/validate.cc
+++ b/validate.cc
@@ -21,7 +21,6 @@
  */
 
 #include "defs.h"
-#include "filterdefs.h"
 #include "validate.h"
 #include <cstdio>
 

diff --git a/validate.h b/validate.h
index cff72bce6e5e0d50c69e19e50675a060870773b6..69ac3bb8547e0b7c74bd546ad49390ee49351dde 100644 (file)
--- a/validate.h
+++ b/validate.h
@@ -23,6 +23,8 @@
 #ifndef VALIDATE_H_INCLUDED_
 #define VALIDATE_H_INCLUDED_
 
+#include <QtCore/QVector>  // for QVector
+
 #include "defs.h"    // for route_head (ptr only), ARGTYPE_BOOL, ARG_NOMINMAX
 #include "filter.h"  // for Filter